bitkeeper revision 1.1236.1.88 (423c8d8cq6U-IPZOZ22Ewk0luopVlw)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
index e906f9852142bd6dad0b27459bb266b6c7bd3ed7,cdfb09fecf4738f53057ebed0d1767e9162c5703..4b7915be29ec9abf0e1e169a451916f18f35079c
--- 1/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
--- 2/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
@@@ -899,6 -897,6 +899,16 @@@ CONFIG_USB_ARCH_HAS_OHCI=
  #
  # CONFIG_INFINIBAND is not set
  
++#
++# MMC/SD Card support
++#
++# CONFIG_MMC is not set
++
++#
++# InfiniBand support
++#
++# CONFIG_INFINIBAND is not set
++
  #
  # File systems
  #

diff --cc xen/common/physdev.c
index c01ae0c03bd3ea96850be3e1c56f457cbf234370,ff79c72b283e58b6b21d34aaa3076e6aa20d3f6d..56beb12bd73c30359a0c8748737f1e135725d105
--- 1/xen/common/physdev.c
--- 2/xen/common/physdev.c
+++ b/xen/common/physdev.c
@@@ -795,28 -733,7 +795,12 @@@ void physdev_init_dom0(struct domain *p
              continue;
          }
  
-         /* Skip bridges and other peculiarities for now.
-          *
-          * Note that this can prevent the guest from detecting devices
-          * with fn>0 on slots where the fn=0 device is a bridge.  We
-          * can identify such slots by looking at the multifunction bit
-          * (top bit of hdr_type, masked out in dev->hdr_type).
-          *
-          * In Linux2.4 we find all devices because the detection code
-          * scans all functions if the read of the fn=0 device's header
-          * type fails.
-          *
-          * In Linux2.6 we set pcibios_scan_all_fns().
-          */
-         if ( (dev->hdr_type != PCI_HEADER_TYPE_NORMAL) &&
-              (dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) )
-             continue;
 -        pdev = xmalloc(sizeof(phys_dev_t));
 +
 +        if ( (pdev = xmalloc(phys_dev_t)) == NULL ) {
 +            INFO("failed to allocate physical device structure!\n");
 +            break;
 +        }
 +
          pdev->dev = dev;
          pdev->flags = ACC_WRITE;
          pdev->state = 0;